Merge pull request #324 from ecsv/batadv/compat-wireless-4.14-rc1
authorSimon Wunderlich <[email protected]>
Mon, 18 Sep 2017 12:41:20 +0000 (14:41 +0200)
committerGitHub <[email protected]>
Mon, 18 Sep 2017 12:41:20 +0000 (14:41 +0200)
batman-adv: Fix conflicts with compat-wireless backports-4.14-rc1


Trivial merge